Merge "Fix the problem that color drawable cache key conflicts another...

Merge "Fix the problem that color drawable cache key conflicts another drawable one. The cache key of a color drawable resource may be the same as another drawable resource's value."