Merge "Make Locale.forLanguageTag() map the language code "und" to language ""."