Merge "libfs_avb: refactoring"