Merge "HIDL stuff to TestApi."
am: bc79587a85

Change-Id: Ice158532f6e17a0f2e30a2d7a686d942b4fc08c1