simplify OS X builds
Merge branch 'master' into internal_metrics_noop