Merge "Format the xml files for the VectorDrawableTest"