Merge "Bring libdvm into default classpath."