Merge "Fix bogus DCHECK and rename DidForkFromZygote." am: 349baca032
am: bc13ef68ca

* commit 'bc13ef68ca632818e0686cd6ea0a971dddb1a2d3':
  Fix bogus DCHECK and rename DidForkFromZygote.