am 42a3e879: Merge "Remove ancient ranlib workaround on Mac OS X."

* commit '42a3e879b63abeadf8fd09403ebb084a3ead887b':
  Remove ancient ranlib workaround on Mac OS X.