Merge "Remove more EGL_ANDROID_create_native_client_buffer references"