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

Change-Id: Ic7d02b4d5b78962a8785f0f75a95b675f0948de7