am ffa5c544: am 6201465c: Merge "Remove more libportable cruft."

* commit 'ffa5c5449d35a68503d34442a4cc575cc389282b':
  Remove more libportable cruft.