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

Change-Id: Iee15d5ef26c68bf200704cd788d49c8c3aa2d696