Merge "defconfig: 8974: add defconfig options for msm8226"