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

Change-Id: I6a9c6e4b6ea7c224406b703bada47f42d0fb0bf7