Skia API changes as a result of an update to the Skia library.

These changes are required to work with r3022 of Skia

Change-Id: I4d4a13bad9acc54934bbb46bdfc08ee424c7a33a
Update WebKit with necessary changes for the Skia merge.

This CL address the modifications needed for r3312 of Skia

Change-Id: I0574657e7a84e53c6b92cefbe07668e9467880db
Merge commit 'refs/changes/90/14590/1' of http://review.cyanogenmod.com/CyanogenMod/android_external_webkit into ics
Merge commit 'refs/changes/91/14591/1' of http://review.cyanogenmod.com/CyanogenMod/android_external_webkit into ics