Merge "Remove unnecessary dependencies on ART internal libraries." am: 0616996614 am: 5f239b684f
am: 36e489ee2d

Change-Id: Idbc8ca12eab74729f5c889174fedc1651ee1b13a