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

Change-Id: If77228b2acbb8ebd55a13306552c666080cd13d0