Fix merge conflict
Fix merge conflict

Fix the missing the compiler fix in 772cb13.

Change-Id: I2e1d0576964483c7890fb87e3db5451816883b9b

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