Merge change 21408 into donut

* changes:
  Improved drawing/matrix support in layoutlib