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

Change-Id: I95a42162c218dcdbaf3b5c4504ca1503b021e758