Updates

Change-Id: Id60ab19a21dbacae2b6092f0b1ee92b2de4a725b
Merge branch 'kitkat' of https://github.com/CarbonMod/android into HEAD