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

Change-Id: Ief1fda0e7bc6da454d24e49853f260d3a1989e50