Merge "Move libstatssocket from frameworks/base to system/core/" into pi-dev