Code fixes
Merge branch 'jellybean' of https://github.com/UltimatumKang/android_frameworks_base into jellybean