Merge "Revert "Ensuring builds compile for both 32 bit and 64 bit targets.""...
Merge "Revert "Ensuring builds compile for both 32 bit and 64 bit targets."" into nyc-dev am: 439a298b
am: 7be5851a -s ours
* commit '7be5851a':
Revert "Ensuring builds compile for both 32 bit and 64 bit targets."
Change-Id: I51b353190175f9955a02709c4c5ef7a92fd6f07c