SpaceX says it remains on track to return to flight by year’s end