Merge "Avoid excessive KGSL maps" into rvc-dev am: acf8443e9a

Change-Id: I52bbb371e58a37c2fb1784e23b6580cd3c104c26