Correct r17804 to match latest version of uploaded CL

TBR=mvstanton@chromium.org

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

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@17807 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
Merge remote-tracking branch 'upstream/master'