Revert "skia_bench: fix crash due to memory issue"

This reverts commit f25df1f7228ef8151ec6633c649e5081d4c28f67.
Revert "skia: Use neon optimized memset functions"

This reverts commit ba7e16eb2480b504ce7527f51e1b3f895ab09c91.
Revert "Add NEON optimized SkARGB32_Black_Blitter::blitMask"

This reverts commit cb837750a37d59c979768320a7cf5ced96c7231c.
Skia merge (revision 3022)

This CL has companion changes to account for API updates in...
 (1) frameworks/base
 (2) external/webkit

Change-Id: Ibb989e76e8bd24313849f9631dbef42cdef9eb7d

Conflicts:

	Android.mk
	src/core/SkBitmapProcState.cpp

Signed-off-by: Evan McClain <aeroevan@gmail.com>
Skia Merge (revision 3312)

This CL also includes changes made to Android's copy of
Skia in their J release branch.

Change-Id: Ib2baecf48004951a3ad4a1574cdc38790c814cbc
Tweaks for forward-compatibility

Change-Id: I3c734d0f7961aada86977d3b7414ee489f3f6c05
Merge commit 'refs/changes/85/14585/1' of http://review.cyanogenmod.com/CyanogenMod/android_external_skia into ics
Merge commit 'refs/changes/86/14586/1' of http://review.cyanogenmod.com/CyanogenMod/android_external_skia into ics
Merge commit 'refs/changes/87/14587/1' of http://review.cyanogenmod.com/CyanogenMod/android_external_skia into ics
fix conflict
Merge commit 'refs/changes/89/14589/1' of http://review.cyanogenmod.com/CyanogenMod/android_external_skia into ics
Merge commit 'refs/changes/10/15810/1' of http://review.cyanogenmod.com/CyanogenMod/android_external_skia into ics