Merge change 5142 into donut

* changes:
  Fix NPE in GradientDrawable constructor