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

Change-Id: I58ca19dd88460fefa37b3e3eb223bde05b32ef50