Merge "Fix build by removing libportable from the default build."