Merge "AudioFlinger files reorganization"