[automerger skipped] Merge "[DO NOT MERGE] Revert "Make libstatssocket shared"" into stage-aosp-master am: 8e5b9c5e76 -s ours am: 841c79b005 am: 75577cb1bf am: 7679a75949 -s ours
am skip reason: subject contains skip directive Change-Id: Ibec38010f2032ab500d1d90e9df0ae32935d1752
This commit is contained in: