am 42fe578d: am 2c86bfd2: Sleazy workaround for webkit build failures.

Merge commit '42fe578dae8d8068bef81f2e8cef4d2c38dddfbf'

* commit '42fe578dae8d8068bef81f2e8cef4d2c38dddfbf':
  Sleazy workaround for webkit build failures.