Merge "Allow statsd_testdrive to work in root"