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

Change-Id: I9e46a92d5a96de93f0d9923b1c403f7cbf2a6951