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