Merge "Convert libmediadrm to Android.bp" am: afca9ca288 am: d63e54187d
am: b064e9594c  -s ours

Change-Id: I9899480d52f6d7eef436f39388fe49ab0be2d067