Merge "Move some libraries in statsd from shared to static"