Merge "Fix MediaPlayer2AudioOutput::setAudioAttributes()"