Bug 920431 - [keyboard] keyboard_layout.json should be customizable

Conflicts:
	build/settings.js
	build/test/integration/distribution.test.js
	build/webapp-manifests.js
Merge pull request #17314 from yurenju/big920431-2

Bug 920431 - [keyboard] keyboard_layout.json should be customizable r=@yurenju