Merge "MediaPlayer2: add Context to create MediaPlayer2"