Merge "MediaPlayer2 DRM: API improvements"