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

Change-Id: I3dc8202a9c0763a13343cdeedccf55b162b953d2