Merge "Move JUnit classes from here into external/junit"
am: 552744390f

Change-Id: I994dc5533d4f1dad35a161e998f57ecab56ab8a3