Merge "Update EGL_ANDROID_get_native_client_buffer.txt" am: c8b3006e57
am: b002413faf

Change-Id: Ic23587e3d1ced162a5d83cc2242192b0117b64aa