Merge "include: dev: Modify the flash_write api to use a flag for spare bytes."