Merge "libfs_avb: adding two public APIs"