[automerger skipped] Remove explicit dependencies on "core" libraries am: 15a23db3ea am: ea04012b95
am: 5e62b1b09a  -s ours

Change-Id: I94848a52a0ba4a7056be0a2951148acc9c95cc78