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

Change-Id: Ib92c902bea7b558b57d0902a7a0e4bcf5c1dda42