Merge "Remove junit-runner and revert files to standard JUnit 4.10" am: 3035e23010
am: 90bab073e4

Change-Id: I6365c7c44b1e3c6b102fb2997e2c59c356211b24