Merge "Fix module name for VR HAL." into nyc-dev