Merge "Allow statsd to link against libstatslog"