Merge "Remove libmediadrm symlinks"
am: 4f0a23d0dc

Change-Id: Id2a5c304d8b8397afe933f2ddca97d2879385494