Merge "Move libstatssocket from frameworks/base to system/core/"
am: 762b0a3b9c

Change-Id: I36fecde38ba9d8bed5b0ecd073a42f45e66aafa3