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

Change-Id: I8513f6846b598d788efd948750684fac9a65841c