c450cd0db6
Merge commit '235073a549ec664caea93e0ccded95e4a6819b6b' * commit '235073a549ec664caea93e0ccded95e4a6819b6b': Make sure sine: is supported again in stagefright commandline tool.