Merge "MediaPlayerTest: Stopped using resources in apk"