Merge "mediadrm: Remove dependency on MediaPlayerTestBase"