Split commits as suggested and preserve Google history

This is the same fix to update the virtio library but it preserves the history from the Google repository and it splits the commits as suggested.