msm: HTC: m4: Don't map the entire heap into IOMMU

CAF only ever set these flags on 8960, and the HTC source I have here
doesn't do it either. As a bonus, the heap alignment is wrong for this
usecase, so it worked largely by chance.

Change-Id: Id96611ba6037486b1b78da60c4d144606eabc55b
Merge remote-tracking branch 'upstream/cm-12.0' into cm-12.0