Port r22678 (f6c5867)

BUG=
R=paul.lind@imgtec.com

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

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