Merge "Sync statsd google3 protos to aosp."