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

Change-Id: I1829d325df18c783b8ac7c7871c9bb68f4cfbed4