Merge "libfs_avb: refactoring"
am: 29bc428f28

Change-Id: I5dc94d5d683c014c6195194097c6981a9c5a7a81