Merge "Remove core-junit from API 26 and above"