am 9f11a471: am b93b0e5c: am 4683d846: am 1fe277e4: Merge "Insulate libportable from bionic changes."

* commit '9f11a471e1878376d3ef9aa2c2324ef7c13f0451':