Merge "Allow Statsd tests to run on R devices"