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

Change-Id: I77e2c50bd222a084be675ddd77ba85f3fc574019