Merge "Fix error in payload_signer_args passing" into main

import shutil

import stat

import sys

import shlex

import tempfile

import zipfile

from xml.etree import ElementTree

  if OPTIONS.payload_signer:

    args.extend(["--payload_signer=" + OPTIONS.payload_signer])

  if OPTIONS.payload_signer_args:

    args.extend(["--payload_signer_args=" + OPTIONS.payload_signer_args])

    args.extend(["--payload_signer_args=" + shlex.join(OPTIONS.payload_signer_args)])

  if OPTIONS.search_path:

    args.extend(["--search_path", OPTIONS.search_path])

  if OPTIONS.payload_signer_maximum_signature_size: