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

Change-Id: I8f35f04b27f75988c57a9ace62238086fe62222d