Merge "Fix issue 4111672: AudioTrack control block flags"