Merge "Update mFillPaint color on GradientDrawable inflation"