Merge "Fix NPE in GradientDrawable#getCornerRadii." into sc-dev