Merge "audio-hal/primary-hal:  Enable snd card monitor"