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

Change-Id: I5b245522b5e6f4d5ee23e6155722c14e4e46bede