Pull in upstream patches for unixtime 0x60000000 CID fix

Pull in upstream patches for unixtime 0x60000000 CID fix

A combination of bugs led to a static CID value being used for all
outbound connections when a process was started after unix epoch time
0x60000000.  That essentially means failure to communicate on all
connections.

Fix the bugs, and also make sure that we always use a random initial
CID instead of getting a static one half the time.

Change-Id: I1d39822d6a32797bbb123fc78b4fc1f5f4c890ea