Fix INT32 typedef

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

Change-Id: Ic3ece594ac2ada95e94ac41c145a7e4dc9e07ffc
Merge "Fix INT32 typedef"
Add -no-integrated-as at local level.

Later we will enable integrated-as as default at the global level.

BUG: 17820427
Change-Id: I60f815a4e22cb157c240005e973f459da93cdb91
Merge "Add -no-integrated-as at local level."