[automerger skipped] Merge "Revert "Move libstatssocket to shared."" am:...
[automerger skipped] Merge "Revert "Move libstatssocket to shared."" am: 0488dfbc -s ours am: 874cf586 -s ours
am skip reason: Change-Id Ibfa25c0fe7874ba08157a5ec43601c5cf8305723 with SHA-1 21f7e6a3 is in history
Change-Id: I065fc650741fa6b1c9b35a9a0b24f1bd87d44b10