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

Change-Id: I67b0984f6eb77d1f2f3cedc02cfb68941a2c0475