am c1da1e1b: am 94ee1bf2: Merge "stagefright amrwbenc: Change keyword ordering"

* commit 'c1da1e1b2f18896c65df85de93a07680175c5277':
  stagefright amrwbenc: Change keyword ordering