Merge "Revert "libmedia_jni pulls in libsfplugin_ccodec"" into qt-dev am: c56f3bbfba am: 230af05ef0
am: d04d4fc1f9

Change-Id: If5ee6d7472cbca44d9a881d1bdf6889846d797ba