Merge "Build junit with core_current"
am: b52b6b012d

Change-Id: I25a73427aca49038a7cea1df5aae8fc8b06e67f4