manta and toroplus 4.2.2
Merge branch 'jd' of github.com:jakdillard/platform_vendor_samsung into jd