Merge "Update libportable to catch up bionic changes."