media: Avoid collision with FFMPEG plugin

Change-Id: Ica2cdf9f6572ec18f396d25758cbb2be1359ac0b
Merge tag 'android-4.4.3_r1' into HEAD

Android 4.4.3 release 1

Conflicts:
	mm-video-legacy/vidc/vdec.mk
	mm-video-legacy/vidc/venc.mk
	mm-video-v4l2/vidc/vdec.mk
	mm-video-v4l2/vidc/venc.mk

Change-Id: I411dbff9a16063e6d9526cbe8fc837b1b61442d2
QCMetadata: add keys for FLAC meta data

Add FLAC meta data specific keys.

Change-Id: I85f34d01ad4b403e236a5fc2ebf054eb383abbde
Merge remote-tracking branch 'cm/cm-11.0' into kk-4.4

Conflicts:
	mm-video-legacy/vidc/vdec.mk
	mm-video-legacy/vidc/venc.mk
	mm-video-v4l2/vidc/vdec.mk
	mm-video-v4l2/vidc/venc.mk