Merge "Replace core-junit with junit"
am: 6ac5293751

Change-Id: I855552fe62801b2534ef63c2c62919bbd845a9af