UKG Proper Cleanup
Merge branch 'jellybean' of https://github.com/UltimatumKang/android_device_samsung_maguro into jellybean