Merge "Separates VTS tests by HAL version."