Fix conflict between lv_map and cb4x4
Fix conflict between lv_map and cb4x4

Change-Id: I0512000554ef74d397332e5ed135fe20e2c4a37e

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