Merge "Remove e4crypt_do_init_user0" am: 8ebd2b14a2
am: 52cdeee3d1

Change-Id: Icacff9aff9dc0e12c1bb47ca53e874bdbc6cb1dd