Merge "Use SkMakeBitmapShader, avoid bitmap copy"