Merge "Update ddmlib to get timeout command am: 66cc81b7 am: b0c18f59" into oc-dr1-dev-plus-aosp am: d5b4992a Change-Id: Ieddeea635665a32728b36b350b01e63132bd1258