NYC moves closer to tobacco-buying age of 21