Merge "Clean up VectorDrawable formatting"