cleanup
Merge https://github.com/TwistedRoms/android into kk4.4