Merge "Add CTS test for VectorDrawable size"