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

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