Merge remote-tracking branch 'CarbonDev/kk' into kk
Merge branch 'kk' of https://github.com/HydraCarbon/android_build into kk