Reconcile with jb-mr2-release - do not merge

Change-Id: I26bfc2b5df2b342e34920ed09a0d46c38d275992
am 82175aba: mm-video: vdec: Convey crop information from driver to client

* commit '82175aba958b9c157a7ecbda9af907f9d4e20052':
  mm-video: vdec: Convey crop information from driver to client
am b597ba5f: mm-video:add a component(role) that has smoothstreaming enabled

* commit 'b597ba5fbaa5e26b54c1e0b5382d3448aad82cbc':
  mm-video:add a component(role) that has smoothstreaming enabled
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: I6dab706b72777fb2695d7df2e64d2d7407b88b1c
am b0caee63: mm-video: vdec: fix buffer-size calculation when in smoosthtreaming

* commit 'b0caee6335fe7e04493b2a4f96f205bce4b1d7de':
  mm-video: vdec: fix buffer-size calculation when in smoosthtreaming
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: Ibc026210346bc07911d11b07fdc11a3974811b2a
am 355146b3: mm-video: vdec: Fix movie studio crash

* commit '355146b35a7f170e8e71e76d0850e41dbe6be9a1':
  mm-video: vdec: Fix movie studio crash
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: I66b21d6b9c73473e4b11bf7ce21cfadf771263fd
mm-video: remove unneeded code from merge

Change-Id: I560370677cd465844703b44c12bf2d38eb79ffd2
Merge https://android.googlesource.com/platform/hardware/qcom/media into jb-devel
Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_hardware_qcom_media into jb-devel
vdec: disable strict aliasing

Change-Id: I3c216a89542dc22b2fa9b24c5b4732833a48c218