mm-video: iommu: Fix decoding for devices without IOMMU (e.g some 8660)

MM_HEAP is OR'ed with IOMMU, so it falls back on MM when IOMMU isnt available.

Change-Id: I7fb039b2e0c3f9da2513c121d390cd3cac2b1a84

Conflicts:

	mm-video/vidc/vdec/src/omx_vdec.cpp
vidc: Use ION for decoder
Merge branch 'cm-11.0' of github.com:Team-Hydra/android_hardware_qcom_media-legacy into cm-11.0
fix compile
mm-video: Add the ability to use PMEM while using TARGET_USES_ION := true
media: fix compile
Follow CM standard for media HAL variant compiling flags

Don't set compiling this repo with "TARGET_QCOM_DISPLAY_VARIANT",
Use "TARGET_QCOM_MEDIA_VARIANT" instead

Change-Id: I15880605058f9cd5628968c4d7aaee5e709e9bae
libstagefright: update headers

Change-Id: I2c991026970b0d3db5fed2d7d60f9651230505cd
Revert "libstagefright: update headers"

This reverts commit 467efd1b23dcc0984e1d6bf3910d9dee3c07e580.
Merge pull request #1 from Team-Hydra/cm-11.0

Merge