am 51cc4322: am 195bb33e: Merge "ART: Account for multidex location strings in VMClassLoader"

* commit '51cc4322e50f73559212abc7aeafe6e5ad4948ad':
  ART: Account for multidex location strings in VMClassLoader