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.
Merge remote-tracking branch 'cm/cm-11.0' into HEAD