Merge change 5289 into donut

* changes:
  Fix TextView's fading edge when compound drawables are setup.