Merge "build_image: add support for specifying number of inodes"