Merge "Fix mktime's errno behavior." am: 228e747b6c
am: b3ed1c5202

Change-Id: I81e24481bc826d8df705335cbacf66c1778cd7ab