Fix INT32 typedef

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

Change-Id: Ic3ece594ac2ada95e94ac41c145a7e4dc9e07ffc
Merge "Fix INT32 typedef"