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

Change-Id: I57b318d5e59d7969af2caea3b3f8cfa6e4c53e22