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

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