Merge "debuggerd: advance our amazing bet." am: 230201dcbf am: 11b938e881
am: 787f1b29d0

Change-Id: I24db057040dc12487cf7b8763fd83272372588f4