am 2c86bfd2: Sleazy workaround for webkit build failures.

Merge commit '2c86bfd285d8b3765da0144da31d1a3d216cb95c' into eclair-plus-aosp

* commit '2c86bfd285d8b3765da0144da31d1a3d216cb95c':
  Sleazy workaround for webkit build failures.