Redo locales and include in all builds
Merge remote-tracking branch 'ls/kitkat2' into spam
Merge remote-tracking branch 'upstream/kitkat' into kk44