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

* commit 'af64fa580e6b3e250f0e3be7af09f462e553763e':
  Replace libdvm reference with libart