Revert "Merge with CyanogenMod repository"

This reverts commit 842a5689ad9462369748f75826b8326bed0c8609.