rewrote ksm/uksm for compatibility with new variants
Merge remote-tracking branch 'origin/jb2' into jb2
Merge commit 'e934c2afae0a6791aa682206bdaaf46ac298cad8' into kitkat