Merge "Improve constant state for VectorDrawable"