Merge "Revert "libmedia_jni pulls in libsfplugin_ccodec"" into qt-dev am: c56f3bbfba
am: 33187ca82e

Change-Id: I6e7701245423178e8597aa6201754f56ad11d156