Drop remnants of broken local locales

Turns out there was still a dependency on a local string which was
messing with other broken locales. Drop it and try to rely exclusively
on the system-provided separators.

Change-Id: I9eb09560efe4e46aca35c97498bfbfee9fa41757
TODO: Dedupe code.
Automatic translation import

Change-Id: Ifcfd04f568c8d6f398e4f2c6106ef3fc1d70bfc4
Automatic translation import

Change-Id: I5d5a52e3545fdd6641eaf965de70a06923dbf737
Merge branch 'upstream/cm-11.0'