am 8a42f881: Merge "Make sure sine: is supported again in stagefright...
am 8a42f881: Merge "Make sure sine: is supported again in stagefright commandline tool." into gingerbread
Merge commit '8a42f881' into gingerbread-plus-aosp
* commit '8a42f881':
Make sure sine: is supported again in stagefright commandline tool.