Translation - Separating AOSP and CM strings

Change-Id: I18b8456d2fe74181402c9fa9f6cab8e996434cfc
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_frameworks_base into cm-10.1-n7