Merge "Switch legacy-test to android.test.base to match AOSP"