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