Merge "msm: Kconfig: Select ARM_L1_CACHE_SHIFT_6 for Krait" into msm-3.0