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