Merge "Inline contents of core_base.mk in mini_common.mk"