Merge "platform: msm8996: Fix hlos load address as per new memory map"