Merge "If enablefilecrypto or init_user0 fails, reboot into recovery." am: 851803d3cf am: cc3e825100
am: d24e7f8647

Change-Id: I06ac64c1e260a4a3d45d8acdf4fec5c0bdeedb21