Merge "Update ddmlib based on several fixes" am: 17e0506320 am: 4f9e34bfd4 am: f067d36268

Change-Id: I8de333dac441e217efd1f114417f6dda15d1a6af