Fixes, additional, stuffs...
Merge branch 'jellybean' of https://github.com/UltimatumKang/android_packages_apps_uTool into jellybean