Merge "Use core_current instead of current and no_framework_libs:true"