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

* commit '36037576fcfe5de9d8862812bd37b5a5cfcd6957':
  Update libportable to catch up bionic changes.