Ensure that overrides come after the common styles

Change-Id: If10553aa0c854cd594d6a7b5b340ea2725869948