Merge "Convert usb hal test to use VtsHalHidlTargetTestEnvBase"