Merge "Merge "libmedia_jni pulls in libsfplugin_ccodec" into qt-dev am: 1c0b6aa767" into qt-dev-plus-aosp
am: 351764bda0

Change-Id: I2ca5800c13fd342c94c5e3cb08f919a450788c4c