Merge "First step on API cleaning on the VectorDrawable to disable animation support"