Merge "Build junit with core_current"