Merge "Mark hidl test libs as vendor." am: 12d911204f
am: 8b6bd56d18

Change-Id: If61451e2bec7a5494658dda326e336e285ac7832