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

Change-Id: Ia3caaae26d30f5f3329ae36c1aac02e592118d0b