Merge "Move JUnit classes from here into external/junit" am: 55274439 am: c62c3a51 am: a7f97479 am: 0ba033ad Change-Id: I24fd90d6043275cf0bbe5bbb7fda65d5a5ccb395