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

# Via Android (Google) Code Review (1) and Xavier Ducrohet (1)
* commit 'f70b8c1cebbf873031bc92bb6ae3be813830d300':
  Fix DateFormat for layoutlib.