Merge "fs_mgr: Update for new libavb API."
am: 5ed7d39857

Change-Id: Iaccfaae0cc8884ef6352c4c338690a31a8d18f75