Revert "defconfig: Replace defconfig with merge of Faux's and CM's."

This reverts commit cc825391b83f319ac6dea3a51fe5c7fb00df79f2.
Revert "defconfig: CyanogenModify defconfig"

This reverts commit 57d9716ea039a2058f33dd6ae3faf7e12cc670fb.
defconfig: Merge Faux and CM's defconfig