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

Change-Id: I881011efc5449f5cedcbe395b82a8d58e024c6da