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

Change-Id: I75cc5a38654b98a41edd2951e807eb5dabdc8815