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

Change-Id: I46e001bdd58d08f4d58ae03e23241a02c7ac10ad