Merge "audio: remove amrwb-plus entry from 8610 registry file"