Merge "Remove libstatssocket from statsd_test" into rvc-dev