Clean up SkinMinerva to pass mwcodesniffer

Change-Id: I73c91d9e1d7e0711048d48f09de3b148558dd4ec
Merge "Clean up SkinMinerva to pass mwcodesniffer"