Merge "force 32-bit build to fix garbled output" am: b2d04a95a8 am: bf6d92d8d8
am: 1623a6176e

Change-Id: Iee460accb1f4d9a521bd56b0ab6462c37419c7ff