am a65d5826: Merge "Move additional files to libdvm"

* commit 'a65d5826d30d42f59283e24047810a4b940335b4':
  Move additional files to libdvm