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

* commit '1fe277e4f991cfe6963fe362f064a68c50170532':
  Insulate libportable from bionic changes.