am ac7d1f9f: am 4e2c5f8a: am 2a87ef1a: am 0123d349: Merge "Move _types.h to 32-bit arch dirs to avoid impact on 64-bits"

* commit 'ac7d1f9f952909ff1aabc6a7c222784ec1679c72':