Merge "Update ddmlib to get timeout command am: 66cc81b7 am: 5efe1f06" into oc-dr1-dev-plus-aosp am: 8bfe5b5c Change-Id: I0e462e202e784fb3326ce95955f773b9f1b0441f