am 4ae6a267: am f3e4fda0: Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"

* commit '4ae6a26719feb21b7fa1cc5f307b591858a30f26':
  Remove dependencies on runtime_libdvm and libdvm.so in general