Merge "Remove unnecessary dependencies on ART internal libraries." am: 30b3905091
am: 2e801cbad6

Change-Id: I0cfcf30c8be58a8307a87349924d45c0d9970cc8