Phone: Refactor CM Additions resources

Change-Id: Ib7dbc96fff2a63d6f6f73bee6b90ff20cc194411
Phone: Fix reorganization

Thanks to Andrew Jiang

Change-Id: I686cdd972587979903293f3e428e314c4d1d49bb
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_packages_apps_Phone into cm-10.1