Bug 913401 - Don't reparse simple strings in ComplexString expressions. r=gandalf

(cherry picked from commit 9aa27905f0c80d1ba1337a27df3a93bd5286ef33)

Conflicts:
	lib/l20n/compiler.js