Settings: Rebase to use cm10.1 settings app

Change-Id: I3ab61385fc6199e25a2134335292ccbb84749b64