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

* commit '27d72c237a6077c63282e02112dfdfbdfb8f0f29':
  Fix bogus DCHECK and rename DidForkFromZygote.