Merge "Compute GradientDrawable's opacity correctly" into jb-mr1-dev