Merge "Use new libfscrypt interface" am: 82f1cbea1e am: 2dd07070a9
am: 29473617c4

Change-Id: Id126e09463104269d3ff036de4b46a45e4f78263