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

Change-Id: I72fbeb80382e7faecad8706f891a47e2a2614932