Merge "mediaplayer: fix audio attributes override by stream type" into mnc-dev