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

* commit '4e2c5f8afa21f44127000c45b6ef8f95f1d08b31':
  Move _types.h to 32-bit arch dirs to avoid impact on 64-bits