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

Change-Id: I76ac28835bbec3ebbdb5e4fe20387184c67ddf20