Redo locales and include in all builds
Merge remote-tracking branch 'ls/kitkat' into HEAD