Merge change 8218 into donut

* changes:
  DrawableContainer was not respecting the value returned by Drawable.getPadding(Rect).