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

Change-Id: I58155d360ff861969fd43bc284ca5b8ead278544