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

Change-Id: Ifec317f2b69ec0bb9a2cba04285f1c9ca6065270