Merge "Convert drm hal test to use VtsHalHidlTargetTestEnvBase"