Merge "Don't change java.text.DateFormat to android.icu.DateFormat"