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

Change-Id: Ib5147e8b535977c40daa6ba1d3281aed7b7bd8c9