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

Change-Id: I24fd90d6043275cf0bbe5bbb7fda65d5a5ccb395