Merge "Adjust to new ddmlib."