Merge "VectorDrawable: Use the matrix scale only if the matrix has no rotation or skew."