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