am 867634ec: Merge "Update libportable to catch up bionic changes."

* commit '867634ecf44a88e407f6080859b1ca12d159eb63':
  Update libportable to catch up bionic changes.