Merge "Isolate SpriteIcon into its own file." am: 38a831c1e3

Original change: undetermined

Change-Id: I136cf55c2fd1346dacb0774d8fb53383b2ae1202