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

Change-Id: I4b45800b5ddc28b039819f79d77464f25cb74db5