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

Change-Id: I82699c3f6f9b07343a0c870a7ae638f61d2c3bac