Merge "IDrmClient: remove IBinder inheritence"