Merge "Replace core-junit with junit" am: 6ac5293751 am: a4d7100a3b
am: 9cb5f2815d

Change-Id: Ic5d35084e11387696997082f9c83ef25f543590b