[xorg-x11-drv-nvidia] rebase to 396xx pt1