2 charged in assault of Capitol officer who died after riot