Merge "Update EGL_ANDROID_get_native_client_buffer.txt" am: c8b3006e57 am: b002413faf am: 9b35a97f3a
am: 3db6b7db32

Change-Id: I44878ebdec8a07a0f8af79a82de21384cbed0bbe