[automerger skipped] Merge "Remove core.mk." into stage-aosp-master
am: 9c96dcaa87
-s ours
Change-Id: I3ccf2cd5efcb74e14083e40f72dce1e439d53771
This commit is contained in:
am: 9c96dcaa87
-s ours
Change-Id: I3ccf2cd5efcb74e14083e40f72dce1e439d53771