House to return with vote to override Trump’s NDAA veto