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

Change-Id: I0d07201412c756ff9d6167582ab19f3d37e7ffdd