Merge "GLConsumer: start using EGL_ANDROID_image_crop" into klp-dev