Android 5.1.1 release 33
am 540e7ee8: Merge "Build on host as 32-bit as there are 64-bit bugs in this code."

* commit '540e7ee8dbf1d7ee72ef45c92efbebcb89bf6d1a':
  Build on host as 32-bit as there are 64-bit bugs in this code.