Merge "libdebuggerd: fix tombstone tests." am: 8eada2a90f
am: 877747f1f6

Change-Id: I6e593eeb02dc580316339e9cd6bede2889e0ce13