Add regular OC on top of LiveOC
Merge branch 'jb-4.2.1' of github.com:Nick0703/samsung-kernel-aries into jb-4.2.1