Merge changes I5cad0b5d,I6863eca2

* changes:
  Render VectorDrawables in software and then upload to the VDAtlas.
  Adding traces and some generic cleanup.