Merge branch 'cm-11.0' into HEAD
QCMetadata: add keys for FLAC meta data

Add FLAC meta data specific keys.

Change-Id: I85f34d01ad4b403e236a5fc2ebf054eb383abbde
media: Move sample format tag to framework

Change-Id: I0c3497e8b2f0446f54eeda9c8c4d506db19f2c95
media-caf: Fix building for msm7x27a

Change-Id: I5fbbf4f955b36c14bdb960a6e02eeab7d76ec451
mm-video: Use multimedia heap on MSM7x30 (720p) too.

Change-Id: I8c7997a1fdd9490cbec9729b07a50f40b1c07c2b
mm-core: Remove obsolete msm7x30 OMX code

This is a leftover since long time ago, remove it to prevent
any conflicts with the normal omx

Change-Id: I8c2ddfb851dc3147361de17fe929b0a577ad9270
Merge branch 'test' of https://github.com/SpawnPool/platform_hardware_qcom_media-caf into HEAD
Merge https://github.com/CyanogenMod/android_hardware_qcom_media-caf into HEAD