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

* commit '638e9eeba63cd0b96a465d0f11691b9a621bc980':