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

Change-Id: I7822e891bf2463b98101ecd55498da328ba89613