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

Change-Id: I596e05732d0368de070227ba1c05315a229fbd65