[automerger skipped] Merge "libmedia: separate codeclist from libmedia" am: 1f72838954 am: 8b470dc956 am: 81d1403fb3
am: ecd8336f9c -s ours
am skip reason: change_id I150c3bd04cc68a3b96a8762ba193fc1595ee6da3 with SHA1 23a180b0c2 is in history

Change-Id: I82db9056d27084e01de6431ee0e71b8c50d8769b