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

Change-Id: I05e396237631d3369c9f293d77068f9a0dcb1cfd