Merge "Merge "Update ddmlib to get timeout command am: 66cc81b7b1 am: 5efe1f06f5" into oc-dr1-dev-plus-aosp am: 8bfe5b5c7e"