Merge "Update ddmlib to newer version for couple of fixes"