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

Change-Id: Ie2a437086f901d4e353e71ac5db8751f518bd833