Merge "Fix libportable build breakage."