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

* commit '815d7a7d05cc95f828f463afc4ac7d52bb0f1b53':
  Fix build by removing libportable from the default build.