Merge "Revert "Update GLES headers from Khronos SVN r26322""