Merge "Allow statsd to link against libprotoutil"