Merge remote-tracking branch 'cm/cm-14.0' into cm-14.0-x86

Conflicts:
	data/media_codecs_ffmpeg.xml

diff --cc data/media_codecs_ffmpeg.xml
index 6b90fac,73e564a..4d44b98
--- 1/data/media_codecs_ffmpeg.xml
--- 2/data/media_codecs_ffmpeg.xml
+++ b/data/media_codecs_ffmpeg.xml
@@@ -26,6 -27,11 +26,10 @@@
              <Limit name="channel-count" max="8" />
              <Limit name="sample-rate" ranges="8000-192000" />
          </MediaCodec>
 -        -->
+         <MediaCodec name="OMX.ffmpeg.alac.decoder"   type="audio/alac" >
+             <Limit name="channel-count" max="8" />
+             <Limit name="sample-rate" ranges="8000-192000" />
+         </MediaCodec>
          <MediaCodec name="OMX.ffmpeg.ape.decoder"    type="audio/x-ape" >
              <Limit name="channel-count" max="8" />
              <Limit name="sample-rate" ranges="8000-192000" />