Merge "Fix SkShader leak for Gradient VectorDrawable and test" into nyc-mr1-dev am: 269f76a7d2
am: 64d24d6631

Change-Id: Id6964ab08d4443a3ad4932a9ed25751c922a411a