[automerger skipped] Merge "Revert "Make libstatssocket shared"" am: 3cb1bf1558 -s ours
am skip reason: Change-Id I05b91efab2a657aec75d436575aff4373f86ed3f with SHA-1 3944f2d907 is in history
Change-Id: Ic3c45cbe10bb586ea108bd319bc15591c85aef3b
This commit is contained in: