Switch demo to use MP3 by default.
Merge remote-tracking branch 'llama-demo/master'