Merge "Add support for using ColorStateList in GradientDrawable"