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

Change-Id: I18f18ec8649c2991cb7328bdff165584e5a4b4d7