Revert "fix build webkit"

This reverts commit 07cf4bde49c78de6ecd94b93d631c937b1b963ba.
Merge branch 'cm-11.0' of https://github.com/imercm/android_external_skia into cm-11.0

Conflicts:
	include/core/SkFixed.h
	src/opts/SkBitmapProcState_opts_arm.cpp