Merge "Fix AudioFlinger dump"