DEFCONFIG: merge cm10.1 defconfig changes, bump version