Merge "libdebuggerd: fix tombstone tests." am: 8eada2a90f am: 877747f1f6 am: 24016570d6
am: 85ab5ca16a

Change-Id: I8709f361345362742f0daa0c21f7b98d17f730c4