Merge commit '30e9c2d4db145e02b5312ce29606b03dd78349d3' into kraken * commit '30e9c2d4db145e02b5312ce29606b03dd78349d3': Better diagnostics in the stagefright commandline tool, support for playing sine-tones using a filename of "sine:[samplingrate]", i.e. sine:44100. Support for playing audio through to the speakers by using "-o" in addition to "-a".