Merge "Fix compatibility problems with newer GLES Khronos headers."
am: 61fbde2446

Change-Id: Ice4c432717296fcf2eb0e92adaa93235d15460b4