Merge "Add keyboard layout package to build." into jb-dev