Merge "Revert "If enablefilecrypto or init_user0 fails, reboot into recovery."" am: b9ee9abebe am: c30557f2bf
am: 492ff5bf09

Change-Id: I4218d302b0924e162c64929f6b69d0a28f6fac4f