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

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