Merge "Update JavaDoc for VectorDrawableCompat and related comments" into nyc-mr1-dev