Add --build and --host to linux to fix build errors
Merge remote-tracking branch 'sm/master' into uber