Squash 4.3 changes.

Conflicts:
	Android.mk
	include/core/SkRect.h
	src/core/SkBitmap.cpp
	src/core/SkBitmapProcShader.cpp
	src/core/SkBitmapProcState.cpp
	src/core/SkBitmapProcState.h
	src/core/SkBitmapProcState_sample.h
	src/core/SkBitmapProcState_shaderproc.h
	src/core/SkBlitter_ARGB32.cpp
	src/core/SkCanvas.cpp
	src/opts/SkBitmapProcState_opts_arm.cpp
	src/opts/SkBlitRow_opts_arm.cpp
	src/ports/SkFontHost_FreeType.cpp
	src/ports/SkFontHost_linux.cpp

Change-Id: I6e5790c3a709ce0c3295b5c56b48b4b41a9ac9ef