Merge changes from topic "revert-149538115"

* changes:
  Revert "Move libstatspull to the apex"
  Revert "Move libstatssocket to apex"