Merge "Revert "LayoutLib: Switch SimpleDateFormat to icu.""