Merge "Compile against "core_current" not SDK stubs"
am: 9ec5ba42a3

Change-Id: I94c37d529d57f7e7021c127c52a73a4c8ec22647