Merge "Fix the missing extension EGL_ANDROID_image_native_buffer" am:...

Merge "Fix the missing extension EGL_ANDROID_image_native_buffer" am: 9676475a am: 4d559c64 am: bf39884c

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2605635



Change-Id: I6496346ddcaf37e79fa88e98f4dfb05d592c1382
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>