Merge "Add fill type support to vector drawable" into nyc-dev