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

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