Merge "Revert "Update ddmlib to get timeout command" am: 101cb219 am: 4eac4138" into oc-dr1-dev-plus-aosp