Merge "force 32-bit build to fix garbled output"