Workaround for removed AOSP strings

Commit aed65253fb207b952a29e416a02d5b9a0c492416 from CAF removed 2 AOSP strings.
This results in aapt warnings and TranslationTools thinks these strings are unused,
so we would have to remove them from all languages.

Move them from cm_extra back to original location so we don't have to remove
them from all languages to overcome the above issues

Also partially revert http://review.cyanogenmod.org/61312 to prevent future merge conflicts.

Change-Id: I7aec7699f73fd7cbe3fef053f2744ea3fdef3fa8