more upgrades
Merge branch 'master' of https://github.com/Blak-KANG/android_frameworks_base