Merge "defconfig: sdm670: Disable unwanted flags in sdm670"