Merge "Use new libfscrypt interface"
am: 82f1cbea1e

Change-Id: Ic52e4d74abb20157dab86a6f9e63ba651315de4a