Merge "VR: fix libvr_hwc-hal build" into oc-dev