Merge "Remove junit classes from legacy-android-test"