Merge "EGL_ANDROID_fence_sync: make it more generic" into jb-mr1-dev