This relands commit 320eab2d. The test failed because it was looking for x86-linux target unconditionally. Now it gets the default target.