am a2a60a21: Merge change 5142 into donut

Merge commit 'a2a60a215030ca2171bc59aaeeac4179816f0796'

* commit 'a2a60a215030ca2171bc59aaeeac4179816f0796':
  Fix NPE in GradientDrawable constructor