Merge "Remove libdvm dependency"