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