Merge "libfscrypt: Support hardware wrapped keys" am: a2654741ab am: bc3044a740

Change-Id: I25667a64a6234f5c1711739129b3d0926ea8f5c2