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

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