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

Change-Id: I906a1762d0f768fdb1cac2147a29ae9e0ab8ffe2