Merge "Remove unnecessary dependencies on ART libraries." am: b1ec613190
am: acf264091b

Change-Id: I9cd5c1eb5dabc7a979c38fe95f848bdf14cab3d7