Merge remote-tracking branch 'cm/cm-10.2' into HEAD

Conflicts:
	Android.mk
	bench/benchmain.cpp
	include/core/SkRect.h
	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/SkDraw.cpp
	src/core/SkPaint.cpp
	src/gpu/gl/GrGLProgram.cpp
	src/images/SkImageDecoder_libpng.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: I7698f054fd074b0724a74e729305325151c592ee