Merge "audioflinger: fix redundant adding to tracksToRemove"