Merge pull request #11914 from davidflanagan/bug905856

Bug 905856: support locked media files r=johu,dkuo,hsivonen,kaze
Bug 884752: configure keyboard layouts and dictionaries at build time