Merge "Clean up the common base core.mk of the sdk and the aosp_* products."