Merge "Remove core-junit/core-junit-static and revert to JUnit 4.10"
am: 50db5f5810

Change-Id: I485d2415f37257a89e5f37f84014c77e11be3ad4