Merge "AudioFlinger: use std::map for mClients" into main