Re-work manifest
Merge branch 'android-4' of https://github.com/DarkCyanogenMod/android into android-4