Merge "Fix DateFormat for layoutlib." into jb-mr1.1-dev