Merge "libmedia_jni pulls in libsfplugin_ccodec" into qt-dev