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