Revert "move VTS HIDL HAL tests to the corresponding interface directories" am: 7c8d9bbaf1 am: 68dd1ef145 am: 77e3816cc1
am: 69b0ddc328  -s ours

Change-Id: Ie7273356d523ba2dc57c38e0cbf3cd9233603b2a