Merge "onvert weaver hal test to use VtsHalHidlTargetTestEnvBase" am: 44765e3ae8
am: 3dce7eb7c9

Change-Id: I28e1eadbfc07aa2e081d701bf56dbeaf12fd3367