msm: iomap: Add ifdef for HTC memory region

* This mapping is only valid for HTC devices with FOOTPRINT and KALLSYM
  mappings.

Change-Id: I4193dfb756ecd10dd9a790da54903bd4c8f82369
msm: 8064: Fix up merge conflicts from LPM driver overhaul

* Fixes conflicts introduced by commit:
  I4f16008098c9525d3543ba23a5f58ddc3a8f942d

Change-Id: I00a1765cf241332ca3580cd2cfb2e6f35cdec3b1
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0