m7: changes for CDMA m7 and regen defconfig