Fix oilpan build breakage from r176803 (take 2)

Looks like the patch also reduced dependencies, and if ENABLED(OILPAN)
blocks need additional includes.

BUG=378670
R=haraken@chromium.org

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

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