Cleanup Skin language and variants

Also introduce generic MinervaTemplate as a placeholder for
a template for a future desktop/mobile skin.

Change-Id: I2e339b52e780a686ebc77cf341e346aa90550571
Merge "Cleanup Skin language and variants"