build: Refactor additional languages/locales

Change-Id: Id90911405f98c5e44d1e5faf071135b8fe59925c