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

Change-Id: I6b747374acf3be5472ba5ad2957a15215598690a