am 877b9486: am 815d7a7d: Merge "Fix build by removing libportable from the default build."

* commit '877b94867c7f420ab0d2f4e0ba7a3f6cc7c1f6e1':
  Fix build by removing libportable from the default build.