Merge "Make statsd cts tests work without root"