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

* commit 'b93b0e5cf8ce008a3c5f082bbc99e86a1e4a97ea':
  Insulate libportable from bionic changes.