Merge "Use correct alpha value when a color is not set on a GradientDrawable." into jb-mr1.1-dev