Merge "libfscrypt: Add Adiantum support" am: 8f6cd07cb6
am: e0fb874ea8

Change-Id: I7ae4bc2bea0dac7f66f2c39a35d0e22f2531558e