Merge "Remove junit-runner and revert files to standard JUnit 4.10" am: 3035e230 am: 90bab073 am: 4fc52e55 am: e4e53cc8 Change-Id: I9f96bc8fd11177d0be7e6bf38b23ccf228e0214a