Merge "MediaDrm: remove Parcel from event listener impl"