Merge "Compile against "core_current" not SDK stubs"