Merge "Hardcode EGL Cache size to something more reasonable" am: 8a767feb14 am: e932226e8d
am: a8ce5dbacb

Change-Id: If9cda69a55f3b72734a9fd7acf2a6124f698b386