Android N MR2 Preview 2
Merge "force 32-bit build to fix garbled output"
am: b2d04a95a8

Change-Id: I3a50d0639d9638c938551401d2e619f25cceb164