[automerger skipped] Merge "Merge "libmedia_jni: separate codeclist from libmedia" am: 1cec587b1a am: f5af5e5aca" into qt-r1-dev-plus-aosp am: fa4e7db9a0 -s ours
am: fd549e6e16 -s ours
am skip reason: change_id I8d4279af883198e1276955831ecb9e3ae7a6e0af with SHA1 097fc5fe58 is in history

Change-Id: Ib97609348774be008a8038d85a1f95c53e1fad3d