Merge "Fix the bad merge of conditionally packaging VBOOT_SIGNER tools CL."