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

Change-Id: Idd3ed3f98a486b761b188784c4478aefe9d03662