am 4c556b20: am 263f20b7: Merge "Tidy and reduce ART library dependencies on the host."

* commit '4c556b20eb2c5798088f515d83c35db2ea3f08e1':
  Tidy and reduce ART library dependencies on the host.