Merge "platform/target: msm8996: Add support for new memory map"