am f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration"

* commit 'f881fa517978adc7ea610a1982e0d071f1fd3425':
  stagefright amr: Avoid C++/C99 for loops with variable declaration