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

Change-Id: I5cb3ce094be188b466f90f6aa41085a5d77fda30