Merge "Cleanup VR HWC type names in libdvr" into oc-dev