[x86] merge 2.6.31 and 2.6.32 configs