am 235073a5: am 8a42f881: Merge "Make sure sine: is supported again in stagefright commandline tool." into gingerbread

Merge commit '235073a549ec664caea93e0ccded95e4a6819b6b'

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