Merge "Fix install location for vendor tests"
am: af59c099c9

Change-Id: Iaf694543edfce134bc7d4951e949a76f1175b542