Merge "debuggerd_client_test: massively increase timeouts." am: ecc9b1bd7f
am: e7ae4f9d5e

Change-Id: Ie03e8ae74636560904c377fcf197f6d95373a8e1