am 428ece23: am c4aa19a5: am ea227787: Merge changes I903353c5,I822dcc74

* commit '428ece23f414d288981ea0ac8f326e9e71a57959':
  stagefright amrnb: Properly negate all values
  stagefright amrnb: Fix a bug on architectures where long is 64 bit