Compile against "core_current" not SDK stubs
am: a05a5ed514

Change-Id: I90ded189af764e7f558aa8749c0318dbe99ce40b