am 69e1f472: Merge change 5289 into donut

Merge commit '69e1f472c33e241f729c470285a5680866ede75c'

* commit '69e1f472c33e241f729c470285a5680866ede75c':
  Fix TextView's fading edge when compound drawables are setup.