[WIP]Cleanup
Merge branch 'kitkat' of github.com:Dokdo-Project/platform_packages_apps_Settings into kitkat