Revert "Fix Button[.Borderless].Colored text styling"
am: 9b7373f916

Change-Id: Ibe9036996c656e0e4c510c46e93912b44e5cdfc0