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

Change-Id: Iaeb2a0087c307ff24b9161280fd3ab4fe5bae451