Update diskimage-builder $LKG commit, allows us to remove 4 needed cherry-picks which have all merged