Merge "Bugfix for libportable to make compile happy."