[automerger skipped] Merge "Dedupe packages in mk's that inherit core_minimal.mk"
am: f93d674ac3  -s ours

Change-Id: I5db9bab2d74f7ff05d2a37ddcfcbe977dce30e9d