Merge "Convert vr hal test to use VtsHalHidlTargetTestEnvBase"