am 4ac17e3b: am 4dfe6faa: Merge "Enable host multilib for ART testing."

* commit '4ac17e3b1979f3dcdc2b515fc9d1f349f1b21da6':
  Enable host multilib for ART testing.