Merge "Support Locale.toLanguageTag on Java 6" into lmp-dev