[automerger skipped] Merge "[DO NOT MERGE] Revert "Make libstatssocket shared"" into stage-aosp-master am: 8e5b9c5e76 -s ours

am skip reason: subject contains skip directive

Change-Id: Ifaddd883136cac51322417242e7eb9570deedee0