Merge "Refactor since EGL_ANDROID_native_fence_sync is exposed via eglQueryString"