Sync cyanogen_msm7227_defconfig with marvel_defconfig

Change-Id: I949ba972d2c3658babb3f15a0b3b1cc76e64ae35