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

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