Builder|OS X: Cherry-picked builder updates from master branch