[automerger skipped] Merge "Remove libmediadrm symlinks" am: 4f0a23d0dc am: a8a70b4225 -s ours
am: 0ff9bd9880 -s ours
am skip reason: change_id I53d703b6d34226926437b0207a2b3d51dff6881a with SHA1 b4e0c3b19f is in history

Change-Id: Iafcb09a2e966653c09d8e3cd4eb3a48c0627dbc3