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

Change-Id: I6656dc200f598a7be20e3606d0755675906abc46