[automerger skipped] Merge "libmedia_jni: separate codeclist from libmedia" am: 1cec587b1a am: f5af5e5aca am: 4deafbba28
am: 21bc2b877c -s ours
am skip reason: change_id I8d4279af883198e1276955831ecb9e3ae7a6e0af with SHA1 cc73dda80b is in history

Change-Id: Ie8b1314f5ecae517a673ba0617f1397d8e092e66