Merge "fs_mgr: Update for new libavb API."