Merge "Inline contents of core_base.mk in mini_common.mk"
am: ee034bd356

Change-Id: Ia7ddb4a102609444fb839df5b53022cfb9bcb4a2