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

Change-Id: I4016437334f02a093d15f8c0dc0d3f39039d7f43