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

Change-Id: I9ec32d93fa3484b4dc7eb40344390186435a6786