Merge "target: msm8996: Update the memory map"