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

Change-Id: I45280244739bafc5463b8893e0110a057461cee2