Merge "AudioTrack in SoundPool uses audio_attributes_t parameter" into mnc-dev