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

Change-Id: If95d848f36bc9dd1180812ba06ec6b486d9daafc