Merge "Move android.test classes from core/java to legacy-test/src"