Merge "libmedia_jni pulls in libsfplugin_ccodec" into qt-dev
am: 1c0b6aa767

Change-Id: I6a5f9429628f3ee225a5ad2462a032be47a1d864