Merge "media jni: remove IDrmClient IBinbder inheritance"