update settings
Merge https://github.com/droyd/packages_apps_Settings into hybrid