Fix INT32 typedef

Was typedefed to long - this is incorrect on many systems.

Change-Id: Ic3ece594ac2ada95e94ac41c145a7e4dc9e07ffc
am ef1b8301: Merge "Fix INT32 typedef"

* commit 'ef1b83013e7814622a9d11579878d342e84580b7':
  Fix INT32 typedef
am a66efb5d: Merge "Add -no-integrated-as at local level."

* commit 'a66efb5d9a21e2666099dffb234b774d796cefbd':
  Add -no-integrated-as at local level.