Merge "MediaPlayer2: callback based DRM APIs implementation"