Merge "MediaPlayer2: mark MediaPlayer-style DRM APIs TestApi"