am 2f43b93f: Merge "Replace libdvm reference with libart"

* commit '2f43b93fabb8f16e68825fb0476f947ab981ea56':
  Replace libdvm reference with libart