Merge "Convert libmediadrm to Android.bp" am: afca9ca288
am: d63e54187d

Change-Id: Icd98a293b27d374872005a9a2ee844a7357352d2