Merge "Inline contents of core_base.mk in mini_common.mk" am: ee034bd356 am: 98c1add8d0
am: 133e4a7fac

Change-Id: I6b61791a4998a2177b8a7e0668f9c2b4a5672b75