Merge "ndk: Refresh EGL/GLES Khronos headers"