Merge "HIDL stuff to TestApi."