Merge "Removes stats_log proto from uid map in statsd." into pi-dev