Fix merge-to-branch options.

BUG=
TBR=ulan@chromium.org

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

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@19453 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
Fix compile on Windows

TBR=yurys@chromium.org,dslomov@chromium.org
LOG=N

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

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