Merge "Remove ancient ranlib workaround on Mac OS X."