Merge "target/platform: msm8996: Update the memory map"