Back to CM's because its way better...

Sry unicorn its true.

Revert "Fix."

This reverts commit 269c359fcec192f2fd451f1c0bfd35e8461b2f58.

Revert "Track aokp torch."

This reverts commit 26a9aed15dceaec56a76c9aff66dd64a95888a72.
Merge branch 'jb2' of github.com:CarbonDev/android into jb2