am 716a0517: am fe5f5d77: Merge "stagefright amrwb: Make a global const array static"

* commit '716a051719993cae576590f6a43620697e50b3b5':
  stagefright amrwb: Make a global const array static