Merge "Add __s32 define." am: 9d63018815
am: 7991c03404

* commit '7991c034048ee5b376a16fb71f9f4b0a3354623d':
  Add __s32 define.