[automerger skipped] Merge "[DO NOT MERGE] Revert "Make libstatssocket shared"" into stage-aosp-master am: 8e5b9c5e76 -s ours am: 841c79b005
Change-Id: I8bc84c5fb70ef86a8ea2140ff3421e3c8adb7ceb
This commit is contained in: