Merge "ota_tool: fix incremental ota error"