Hygiene: Cleanup use of buttons.less so it's clear it is there for caching purposes

This was causing confusion.

Change-Id: Ia7f55172af7260ad0936b6ef95bca7b365010e40
Merge "Hygiene: Cleanup use of buttons.less so it's clear it is there for caching purposes"