Merge "msm: board-7627a: Make ION heaps use outer cache" into msm-3.4