Merge "Change method name in VectorDrawable_Delegate" into nyc-dev