Merge "Remove core-junit/core-junit-static and revert to JUnit 4.10" am: 50db5f5810 am: 38d1882ee2 am: e0df57581a
am: 87fef242a9

Change-Id: Icf0ccba66c16e4c6bee5d47529f00a27e2a0aece