Massena police find heroin with search warrant, two men charged