Android CTS 5.1 Release 20 (3993894)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAlkwgcIACgkQ6K0/gZqxDnhejQCeMdmEeqXHuQVo6DuQ/P+EiCxB
gkMAnjMBcxmyqWTqS5umDbt5weyDI5eG
=k4Mp
-----END PGP SIGNATURE-----
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.