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