am 1cfd5ec3: am 924470b1: Merge "Bring libdvm into default classpath."

* commit '1cfd5ec3328ef7e66ca8481da036e36f0a3a3074':
  Bring libdvm into default classpath.