Merge "Remove EGL_KHR_image_gl_colorspace workaround for Android P" into main