Merge "Remove junit classes from android.jar"