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

Change-Id: I551f4cea142e70db7eb88eaaa86cd3c7afc6897c