Properly upgrade int before operation
Properly upgrade int before operation

Change-Id: Ibca63a41bdffaab2ee603497e8a5fc66d5b7d11f

GrokImageCompression/aom,GrokImageCompression/aom,GrokImageCompression/aom,GrokImageCompression/aom,GrokImageCompression/aom,GrokImageCompression/aom