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

Change-Id: I2518c12ab3fb7fcf41ba4f99ead22eb94a1818db