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

Change-Id: I8321c2160bf4877e1e9ded54e4829f97c0283712