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

Change-Id: Id5cbce04590b2956328287dcc1821b74d9ac9bd0