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

Change-Id: I5310d18a78f134896a4fb898edc995afa9ce2e95