The old Escondido Police headquarters building on Grand Avenue, vacant for several years, will soon become home to a civilian fitness and training facility known as the Warfighter Academy under terms of a lease agreed to by the City Council Wednesday night.