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

Change-Id: Id127fac592cfa2cb4fde330cdacd49b85cd43420