Merge "MediaPlayer2: use MediaPlayer2::Create()"