Merge "Fix audioflinger allocator concurrency" into main