Merge "Clean up on VectorDrawable."