Hygiene: Fix upstream skin mobile to skin minerva fail...

Looks like a rebase went wrong and we are redefining methods from
SkinMinerva in SkinMobile...

Change-Id: I3b39fad9b255d00df877ba112671d7a73263e5bd
Merge "Hygiene: Fix upstream skin mobile to skin minerva fail..."