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

Change-Id: Ideead3236f3d43a05ba5298438a02ad9f0c25b3f