Merge "Fix visibility rules for apex/statsd"