Merge pull request #13106 from davidflanagan/autocorrect-config2

Bug 884752: make keyboard layouts and autocorrect dictionaries configurable at build time r=rlu,yurneju,pike(cherry picked from commit 9b0ea7a308cc99fb389e503c63dc7792692247c9)

Conflicts:

	Makefile
	apps/keyboard/js/layout.js