[automerger skipped] Dedupe packages in mk's that inherit core_minimal.mk
am: 0be683f290  -s ours

Change-Id: I3abb3dab09e939a365210b7e8a7321899e0abdaf