Merge "Add visibility property to framework-statsd stubs"