Merge "Refactor statsd_testdrive to support recording N atoms at the same time."