Clean up simple integer operations.
Clean up simple integer operations.

Change-Id: I3bd11c54c49602e4f63310d50bd9b20fae234329

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base