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

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