Hygiene: Move watchstar styles to appropriate location

Change-Id: I7cb234606028679fc02514d1e1212a6eae9127b3
Merge "Hygiene: Move watchstar styles to appropriate location"