Merge "Remove mentions of EGL_ANDROID_image_crop"