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

Change-Id: If956b45e21b7d576daf5dcece9c1acea35d952a0