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

Change-Id: I41e9126d946bd347096fe8dce4887e9a2c67fe95