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

Change-Id: Ie4d233352bb880864426cb56c4e7edb30dd6ec66