Merge pull request #22400 from yurenju/test-l10n

Bug 1047244 - gaia-build jobs failing with "build.test.js | Build GAIA f...
Conflicts:
	build/test/integration/multilocale.test.js