NYPD upgrades charge against subway sucker-punch suspect