Merge "build: Add spare size flag to mkyaffs2image"