Merge "Convert health hal test to use VtsHalHidlTargetTestEnvBase" am: 8a5a99ca3b
am: ef211ccb88

Change-Id: I62b46011d2d6ee7c7a7645805112cfc36a32c41f