Merge "Update and add attributes to the JavaDoc for VectorDrawable" into nyc-dev