Lawmakers OK NYPD watchdog, overriding vetoes