Code simplification
Code simplification

Change-Id: I2a9e16bf337a91219fc2aa10937d3cd1dfa67a71

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