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

Change-Id: Iec5b0fa7bed5956b18667a4efa9d4e96afc4be4f