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

* commit '4683d8465c2b7155d0fa2db050c0a77ddb458d5e':
  Insulate libportable from bionic changes.