Merge "Build junit with core_current" am: b52b6b012d am: 697eeee7d5
am: 14abea3a56

Change-Id: I15a1c84fd41e11ac2e5b5f43907d3ad0c881007f