Merge "DrawVectorDrawableOp for old rendering pipeline" into nyc-dev