Merge pull request #15035 from timdream/keyboard-remove-ime

Bug 956659 - Only include IMEs for selected layouts in the build, r=yurenju, djf
(cherry picked from commit 6c2dac3444e0d68eb81677434d9c166692d8d247)

Conflicts:
	.gitignore