Merge "strptime: support everything that strftime supports."
am: ff923681be

Change-Id: I39dd975a674c115e2fc9212c1bd967a6aefd6e2b