Revert "DO NOT MERGE Fail gracefully when we fail to fork the update binary am: de1b53d067"
am: 54881abb52  -s ours

Change-Id: I376f9d0d81dbe2304a7582fd3643307c0a19e3f7