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

* commit 'ef3d4ea038690127ca6c685017fea6fb3aeaf61d':
  Replace libdvm reference with libart