Merge "Fail gracefully when we fail to fork the update binary"