am 92f95ee3: am bd642f3e: Make the simulator use alsa instead of esound.

Merge commit '92f95ee3fb30ed86fb0b9e080551552448b511ae'

* commit '92f95ee3fb30ed86fb0b9e080551552448b511ae':
  Make the simulator use alsa instead of esound.