Pass phpcs-strict on skins/

Change-Id: I2116e02445e292fdf54ac052a6b5bd82f9a79955
Merge "Pass phpcs-strict on skins/"