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

Change-Id: Id557aff2a482effa806c3f5dc6d4023eb15cd7d0