[automerger skipped] Merge "Make libstatssocket a shared_lib" am: d25f5dbb...
[automerger skipped] Merge "Make libstatssocket a shared_lib" am: d25f5dbb am: 5806f7c2 -s ours am: b71b653b -s ours
am skip reason: Change-Id I5889dd718536f5f2c693b4c2e7331c9cc2eb2ac9 with SHA-1 d78f4dab is in history
Change-Id: I10231ae3f503ffe6a545bb915cc69a85c20a8f69