Merge "MediaDrm: throw exceptions with extra info"