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

Change-Id: Ie0142719a4b3836912aa4b41ce72f782e8c68f43