Merge "Revert "audiopolicy: align input and output devices for engine""