Merge "Merge "Update ddmlib to get timeout command am: 66cc81b7 am: 5efe1f06" into oc-dr1-dev-plus-aosp am: 728aca53"