Merge "Fix the missing extension EGL_ANDROID_image_native_buffer" am: 9676475a61 am: 4d559c641f am: bf39884c2d am: 08540a4fc9 am: 3cbf4ebb48

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

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