Merge "tombstoned: Add a shared library version of libtombstoned_client..." am: 0f185bb148
am: ad9cb6678d

Change-Id: I931adef42e92a415a383c4e30cd968d301e30ea2