Merge "Replace legacy-test with android.test.base in bp files"