Regen defconfig and change local version to r31