Merge "Libcore: Restore Locale modifications"