Merge "Remove e4crypt_do_init_user0"
am: 8ebd2b14a2

Change-Id: I0488356d48258e1e5397e6f3246cbf60fc07f3a5