Merge change 6478 into donut

* changes:
  Fix ShapeDrawable.inflateTag() to accept proper dimension specs for padding