Merge "Fail gracefully when we fail to fork the update binary" am: 340a2d364f
am: 2a962adc85

Change-Id: Ifad227336cc3a0db254a9bfef0de2678d8dd86bd