Merge "Build with core_current"
am: 56dce0b1b7

Change-Id: I627e0b57fee562bb812fd0de60b6e7712ae0dd10