Merge "Disable constant state sharing for VectorDrawable" into nyc-dev