Merge "libmedia_jni pulls in libsfplugin_ccodec" into qt-dev am: 1c0b6aa767
am: 27d23af2d9

Change-Id: I6db3437431e1f4cc8602f6c79e7822596907d4c0