Merge "Remove usages of legacy-test and legacy-android-test"