Updates for HALO

Signed-off-by: aways <aways@c-rom.org>
Merge branch 'kitkat' of github.com:X-ROM/android_packages_apps_Settings into kitkat