Merge "build_image: right-sizing at least some spare inode"