All-rounder Rikki Clarke has signed a new four-year contract with county champions Warwickshire which keeps him at Edgbaston until 2017.