Merge "Switch usages of legacy-test to android.test.base"