Merge "Convert evs hal test to use VtsHalHidlTargetTestEnvBase" am: 9be06304d6
am: 7e4209ee06

Change-Id: I42c8114080d5253e602820c6dea22b9dc077c5a2