Update to build with current packer master.