Merge "libfs_avb: Fix unit test failures"