Merge "audioflinger: Use AUDIO_HARDWARE_MODULE_ID_MSD where appropriate"