Merge "Add systrace for VectorDrawable inflation and draw" into oc-mr1-dev