Update strings.xml
Frameworks: config.xml back to the past

Change-Id: I40147151c07d144ff694b8d1a6ddf239086c2ea4
Merge remote-tracking branch 'cmbq/cmbq' into cm-10.1