Merge branch 'chrome/m57' into update-m57

Merge branch 'chrome/m57' into update-m57

# Conflicts:
#	gm/imagealphathreshold.cpp
#	include/c/sk_data.h
#	include/c/sk_paint.h
#	include/c/sk_path.h
#	include/c/sk_picture.h
#	include/c/sk_types.h
#	include/core/SkMilestone.h
#	src/core/SkColorLookUpTable.cpp
#	src/core/SkColorSpacePriv.h
#	src/core/SkColorSpaceXform_A2B.cpp
#	src/core/SkColorSpace_ICC.cpp
#	src/core/SkSpecialImage.cpp
#	src/gpu/GrClipStackClip.cpp
#	src/gpu/GrPipeline.cpp
#	src/gpu/GrRenderTargetContext.cpp
#	src/gpu/GrRenderTargetOpList.cpp
#	src/gpu/ops/GrAADistanceFieldPathRenderer.cpp
#	src/gpu/ops/GrAADistanceFieldPathRenderer.h
#	src/image/SkImage_Gpu.cpp
#	src/image/SkSurface_Gpu.cpp
#	src/opts/SkRasterPipeline_opts.h