Merge "media jni: remove Parcel from IDrmClient interface"