Backport Chromium commits to fix the Ozone build with 35.0.1916.114.

These are a bunch of commits required to make the build with Ozone work
again after moving Chromium to 35.0.1916.114, caused by r260900.

They were unfortunately rejected for merging into M35 in Chromium
itself[1], but we need them nonetheless for our Wayland builds.

[1] http://code.google.com/p/chromium/issues/detail?id=372340