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

Change-Id: I9f96bc8fd11177d0be7e6bf38b23ccf228e0214a