Merge "Includes new static libfs_avb"