am bc635a25: am 3d632546: (-s ours) Merge "Update mFillPaint color on GradientDrawable inflation"

* commit 'bc635a2574430f345aaa042e003935f315788304':
  Update mFillPaint color on GradientDrawable inflation