Merge change I998a5863 into eclair-mr2

* changes:
  Use NPAPI headers from WebCore/bridge/ rather than those from V8Bindings/npapi/.