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

Change-Id: If34fd3feb204322193d5f8d247b9719fd575a639