Merge "onvert weaver hal test to use VtsHalHidlTargetTestEnvBase"