Merge "Fix background tint for Button.Colored on API 22" into nyc-mr1-dev
am: 69b8dd032e

Change-Id: Ib13c62e0176d34f38343c5180dfab71963ec9812