Merge "Move JUnit classes from here into external/junit"