Merged r16393 into 3.20 branch.

And revert "Revert 3.20 branch to 3.20.17.7", bringing
the 3.20 branch back to the state of 3.20.17.11 (plus r16393).

R=hpayer@chromium.org

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

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