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

Change-Id: Ic148650d73ea44d4af1de066be8e56fbfc9c75ae