Merge "Convert libdrmframework and drmserver to Android.bp"
am: a33999bab9

Change-Id: I3f104612c15764b87ff6aaed1bd04c08b7281e6b