Merge "sound/asound.h: add header for ALSA"