Merge "Correctly expose EGL_ANDROID_native_fence_sync to hwui"