Merge remote-tracking branch 'upstream/kk' into kk
Merge branch 'kk' of https://github.com/abcdjdj/android_frameworks_native into kk