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

* commit '50010e96b68468692f5f110a04c40d66898131ab':
  Remove ancient ranlib workaround on Mac OS X.