Merge "Add file-contexts for statsd apex"