Merge "Use new C++ libfscrypt interface." am: 7e43d985cf am: e96e670746 am: d1823f16c8
am: 9572a9fcdc

Change-Id: I2bb5b868ea8bf494eab1e4725a82e7b112ad63b2