Fix my derp
Merge branch 'kk' of github.com:SimpleAOSP/android_frameworks_base into kk