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