Merge "[automerger skipped] Merge "Extract android_media_Utils.cpp as a lib" am: d14d29ca8f am: 6c7d8d31e0 am: 1c1577ba63 -s ours am skip reason: change_id I1e1ea4bc1ff7022d8d9c42785c8c00e3ca153a50 with SHA1 cb1e896d57 is in history"