Merge "Remove core-junit from API 26 and above" am: 5db2e2633a
am: 1354be504d

Change-Id: I54ea50898073bff164c5a078cf95f149e6ddd0ca