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

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