Merge "platform/target: msm8996: Remove support for 3gb map"