Merge "Remove non-junit android.test.base classes from android.jar"