Merge "Fix MediaPlayer construction with AUDIO_SESSION_ALLOCATE."