carbonify after rebase

Signed-off-by: matt <mbloomfield87@gmail.com>
Merge branch 'cm-10.1' of github.com:dastin1015/android_device_samsung_d710 into jb2
Remove vendorsetup

Change-Id: I72fbf91ceca1b54c685fa2d8ad5291e2b7f01b8e