Compile against "core_current" not SDK stubs
am: 9a78f73ae7

Change-Id: I2fee1ec5ba2da2a39e5d126947402b17e04733c0