Merge "Add systrace for VectorDrawable inflation and draw"