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

Change-Id: I42608193138fe6de4c54a492ca76de01a3f87167