Merge "Compile against "core_current" not SDK stubs"
am: 85e44354a9

Change-Id: I2e53129d2a7768c9ec6b0e4d97e97a238021a357