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

Change-Id: I7688c01a5b16da5714f1a59697f120e8a3821cc1