Kill some references to legacy skins

More cleanup after the great skin removal of 2013.

Change-Id: Ia91e9467afac4a0e755869b8791d4fc9a6fb5a56
Merge "Kill some references to legacy skins"