Merge changes I903353c5,I822dcc74

* changes:
  stagefright amrnb: Properly negate all values
  stagefright amrnb: Fix a bug on architectures where long is 64 bit
tree: 9b84579b7355e767287ceb9fb1e0008041a83606
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/