Reland r168780

r168780 was reverted in r168786 because it broke all oilpan builds.
This CL relands r168780 with the oilpan-side fix.

TBR=hashimoto

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

git-svn-id: svn://svn.chromium.org/blink/trunk@168810 bbb929c8-8fbe-4397-9dbb-9b2b20218538