Merge "defconfig: msm: Update misc configs to align with android base"