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

* commit '6201465c3c7ff383fe08ed033ea71d467b21b8b0':
  Remove more libportable cruft.