Merge "Add fillType support to VectorDrawable" into nyc-dev