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

Change-Id: I112374bce87c4905eddb4883f7aad95d32b429c8