Merge "Build with core_current"
am: 9b65b98ff5

Change-Id: I60e8d94c835cc399bed23bebad22c436d9aa2b7a