Merge "Use <linux/fscrypt.h> from Bionic"
am: 1d3cd24c4e

Change-Id: Icf5a715146d6edd6740fcff0b45df9e817fac1ef