Merge "Replace core-junit with junit" am: 2b483ecb8b
am: 6423c63a15

Change-Id: If83290a485d16bbfc6a0a38d73124c3b9d63128d