am 1844a1ee: am 50010e96: am 42a3e879: Merge "Remove ancient ranlib workaround on Mac OS X."

* commit '1844a1ee28d69467a1cd5a7d03fd6f6a3616cd7b':
  Remove ancient ranlib workaround on Mac OS X.