Merge "Remove core-junit/core-junit-static and revert to JUnit 4.10" am: 50db5f58 am: 38d1882e am: e0df5758 am: 87fef242 Change-Id: Icf0ccba66c16e4c6bee5d47529f00a27e2a0aece