Sync with downstream. Add gengenisoimage.