Merge "VR: Replace sw sync fences with egl sync fences"