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

Change-Id: If0ca6bbb6709423495136881b91c37ff32a8eefa