Merge "init: use libfscrypt for file-based encryption setup" am: 82c6ba74e2
am: bc3c6f670a

Change-Id: I097b58a9bc2dccde77e50f447a8286524c399df1