Merge "Add __s32 define."
am: 9d63018815

* commit '9d630188159868589992116dd5d67cecf17bf257':
  Add __s32 define.