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

Change-Id: Idbc8ca12eab74729f5c889174fedc1651ee1b13a