Merge "debuggerd_fallback: don't recursively abort." am: e0068770e3
am: 47bee24270

Change-Id: I2f8d366cb875a596909f731b298b1d6141e3a8f5