Re-land 16025005 with tiny fix for statics perf issue

16025005 had review from: palmer@chromium.org, piman@chromium.org, scherkus@chromium.org

BUG=163795
TBR=scherkus@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208003 0039d316-1c4b-4281-b951-d872f2087c98
27 files changed