Merge "Update EGL_ANDROID_get_native_client_buffer.txt"