Merge "Update the javaDoc for VectorDrawable and AnimatedVectorDrawable" into nyc-mr1-dev