Merge "Re-enable statsd from droidfooders by default"