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

Change-Id: Ieec0b3b57fea9d34ca438c8588c8e3003f64341a