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

Change-Id: Ie9ea6248dc684f010fed122f8b5afe73a694142c