Replace and fix the havana libvirt driver hotpatch.

This reverts commit 50d98904b8f3059440f977827f9c52ee0db0c0d8.

Change-Id: Ifedede3295ce1acc169fc435e6d68adcac8daa99