Merge "AudioTrack: Obtain stream type from AudioFlinger" into sc-dev