Merge "msm8960: Support non-interleaved memory configuration"