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