Merge "Update layoutlib following platform change in VectorDrawable"