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

Change-Id: I941f70db135a1410ab96de29fd7a524dcd995d5c