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

Change-Id: Ic71192ff8c485e2ae3fe5a2befceeb45c4ed73c0