Merge "Clean up GradientDrawable styled attributes, fix useLevelForShape" into lmp-mr1-dev