Merge "Fix compatibility problems with newer GLES Khronos headers." am: 61fbde2446 am: 104fc9efc7 am: a2729f0fae
am: 4f4b0cacbf

Change-Id: Ie6a178d5062184b91e305cb66ac84548151bd3ed