Switch back to CyanogenMod's frameworks_base and packages_apps_Settings.

Change-Id: Ie0f453d099107f342e6d65c9d0d505d22441daca