Merge "Compile against "core_current" not SDK stubs" am: 9ec5ba42a3 am: 789ca76cc7
am: 6a70c60607

Change-Id: Ie3e3a59774af3262e82eb6296a3896758c89b892