Tie decimal and grouping separators to the locale

Fix parsing breakage when misconfigured local translations make
both symbols the same. (which blocks decimal separators entirely)

Change-Id: I60b9dd3d0f577f688decaac45fe1290264efaf87
Calculator: Remove unused string

Also readd cm_extra to get rid of compiler warnings.
Why was this even removed...?

Change-Id: Ied76a576b6c0aae64115084973a2346031388f2d
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Calculator into kitkat