Merge "debuggerd_fallback: fix race." am: cd2fa1f432
am: 135dacd4d1

Change-Id: I5330f48b7f1d713644465865ac33badcce046d7a