Fix cc feature for upload in merge script.

TBR=ulan@chromium.org

Review URL: https://codereview.chromium.org/608723002

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@24246 ce2b1a6d-e550-0410-aec6-3dcde31c8c00