LPS-44476 Fix ant format-source issues