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

Change-Id: Ied6f3283c12b365d9b23baa035f629c7a2d3a337