am 83582faf: am a8dc93ef: Merge "mediaplayer: fix audio attributes override by...
am 83582faf: am a8dc93ef: Merge "mediaplayer: fix audio attributes override by stream type" into mnc-dev
* commit '83582faf':
mediaplayer: fix audio attributes override by stream type