Vendor Samsung: reorganize note 3 and re-add variants

Thanks to The Muppets

Change-Id: I832d4e1d18c3a92180fa51a027795911bb1b254b