Merge "Add CTS tests for specifying theme overrides as attrs"