Merge "Fix VectorDrawable size rounding issue" into oc-dev am: be030126fe
am: ca353e51ce

Change-Id: I41bb4065bb6684871f5d2edb8037d6d98b1f6d49