Merge "Make libportable.a compile on host"