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

* commit '51fe2ff2146fa95b3d40c2dcfdccd6af954bb1f3':