Merge "Mark hidl test libs as vendor." am: 12d911204f am: 8b6bd56d18
am: 1d3fc97e0f  -s ours

Change-Id: I974f6221833d3157d6357115274852c6874f2d3d