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

Change-Id: I0a8c89098483948516220d694571ca3772c3f23e