d2/jf: unify devices

Change-Id: I22026b5241b2a667fcd016049d01fae59d5c87ba
Merge pull request #408 from invisiblek/consolidation

d2/jf - consolidation
Merge branch 'cm-11.0' of git://github.com/TheMuppets/proprietary_vendor_samsung into cm-11.0