Merge "Add support for using ColorStateList as GradientDrawable's stroke"