Merge "Fix compatibility problems with newer GLES Khronos headers."