Merge "Merge "Update ddmlib to get timeout command am: 66cc81b7b1 am: b0c18f594e" into oc-dr1-dev-plus-aosp am: d5b4992a7b"