Merge "Replace legacy-test with android.test.base in bp files" am: 2285630e4b am: caacf3e7c4
am: 2b3bf45c73

Change-Id: I0c4b7705176b0ae7eb4b06bf5a138757d6b16e9c