Trebuchet: Reset to AOSP strings

Change-Id: I79b789e278c44980ce2d2250d96370bb1f2942ed
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2