Remove explicit dependencies on "core" libraries am: 15a23db3ea
am: ea04012b95

Change-Id: I9505160d50638299cf9b6b2397c3d76259d82248