am c4aa19a5: am ea227787: Merge changes I903353c5,I822dcc74

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