Merge "Revert "Fix Audioflinger crash when TeeSink is enabled""