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

Change-Id: I9c260108edea555dc75811b7d343ec33655397d9